From 52a8efe1a7bd2e9896d7769347eb3611e36e5052 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Mon, 15 Mar 2004 15:00:49 +0000 Subject: [PATCH] bitkeeper revision 1.797 (4055c521Ophk9zIrp59mxPKyKg_0MA) Makefile: Rationalise makefiles by folding dist option into install with a prefined prefix. --- Makefile | 4 ++-- tools/Makefile | 8 -------- tools/balloon/Makefile | 18 +++++++----------- tools/examples/Makefile | 17 ++++------------- tools/misc/Makefile | 15 ++++----------- tools/misc/miniterm/Makefile | 16 ++++++++-------- tools/nsplitd/Makefile | 19 ++++++++----------- tools/xc/Makefile | 4 ---- tools/xc/lib/Makefile | 14 ++------------ tools/xc/py/Makefile | 10 +--------- tools/xend/Makefile | 19 +++---------------- tools/xentrace/Makefile | 16 +++------------- xen/Makefile | 7 +------ xenolinux-2.4.25-sparse/arch/xeno/Makefile | 6 +++--- 14 files changed, 46 insertions(+), 127 deletions(-) diff --git a/Makefile b/Makefile index bd7895a958..f1943310e0 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,8 @@ install: all $(MAKE) -C tools install dist: all - $(MAKE) -C xen dist - $(MAKE) -C tools dist + $(MAKE) prefix=`pwd`/../install -C xen install + $(MAKE) prefix=`pwd`/../install -C tools install clean: $(MAKE) -C xen clean diff --git a/tools/Makefile b/tools/Makefile index 17d7c74ca8..720b61417f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -33,14 +33,6 @@ install: all $(MAKE) -C xentrace install $(MAKE) -C xend install -dist: all - $(MAKE) -C balloon dist - $(MAKE) -C xc dist - $(MAKE) -C misc dist - $(MAKE) -C examples dist - $(MAKE) -C xentrace dist - $(MAKE) -C xend dist - clean: $(MAKE) -C balloon clean $(MAKE) -C xc clean diff --git a/tools/balloon/Makefile b/tools/balloon/Makefile index baf91f2fc7..dabea38870 100644 --- a/tools/balloon/Makefile +++ b/tools/balloon/Makefile @@ -1,17 +1,13 @@ -CC = gcc -TARGET=balloon -$(TARGET): balloon.c - $(CC) -O2 -Wall -o $(TARGET) balloon.c +CC = gcc +CFLAGS = -Wall -O3 +TARGET = balloon -install: $(TARGET) - mkdir -p $(prefix)/usr/bin - cp -a $(TARGET) $(prefix)/usr/bin +all: $(TARGET) -dist: $(TARGET) - mkdir -p ../../../install/bin - cp -a $(TARGET) ../../../install/bin +install: all + mkdir -p $(prefix)/usr/bin + install -m0755 $(TARGET) $(prefix)/usr/bin clean: $(RM) *.o $(TARGET) *~ - diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 2170c22ca7..570e291f66 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -7,20 +7,11 @@ all: install: all mkdir -p $(prefix)/usr/bin - cp -a $(INSTALL) $(prefix)/usr/bin - #chmod 755 $(INSTALL) mkdir -p $(prefix)/etc/xc - for i in $(ETC) ; do [ ! -e $(prefix)/etc/xc/$$i ] && echo Install $$i && cp $$i $(prefix)/etc/xc/ ; done || true mkdir -p $(prefix)/etc/xc/auto - for i in $(INITD) ; do [ -e $(prefix)/etc/init.d/ ] && [ ! -e $(prefix)/etc/init.d/$$i ] && cp $$i $(prefix)/etc/init.d/ ; done || true - -dist: all - mkdir -p ../../../install/bin - mkdir -p ../../../install/etc - mkdir -p ../../../install/init.d - install --mode=555 $(INSTALL) ../../../install/bin - install --mode=444 $(ETC) ../../../install/etc - #chmod 755 $(INSTALL) - install --mode=555 $(INITD) ../../../install/init.d + mkdir -p $(prefix)/etc/init.d + install -m0755 $(INSTALL) $(prefix)/usr/bin + install -m0644 $(ETC) $(prefix)/etc/xc + install -m0755 $(INITD) $(prefix)/etc/init.d clean: diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 59fa4c1c93..8756881c07 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,3 +1,4 @@ + CC = gcc CFLAGS = -Wall -O3 EXTRA_INC = -I../../xen/include/hypervisor-ifs @@ -12,24 +13,16 @@ TARGETS = xen_cpuperf INSTALL = $(TARGETS) xen-mkdevnodes xen_nat_enable xen-clone all: $(TARGETS) - $(MAKE) -C miniterm + $(MAKE) -C miniterm install: all mkdir -p $(prefix)/usr/bin - cp $(INSTALL) $(prefix)/usr/bin - for i in $(INSTALL); do chmod 755 $(prefix)/usr/bin/$i ; done + install -m0755 $(INSTALL) $(prefix)/usr/bin $(MAKE) -C miniterm install -dist: all - mkdir -p ../../../install/bin - cp $(INSTALL) ../../../install/bin - for i in $(INSTALL); do chmod 755 ../../../install/bin/$i ; done - $(MAKE) -C miniterm dist - clean: - $(RM) *.o $(TARGETS) + $(RM) *.o $(TARGETS) *~ $(MAKE) -C miniterm clean %: %.c $(HDRS) Makefile $(CC) $(CFLAGS) $(EXTRA_INC) -o $@ $< - diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile index 993c156d5e..86e1bf0ccf 100644 --- a/tools/misc/miniterm/Makefile +++ b/tools/misc/miniterm/Makefile @@ -1,13 +1,13 @@ -CC = gcc -CFLAGS = -O3 -march=i686 -Wall -all: miniterm +CC = gcc +CFLAGS = -Wall -O3 +TARGET = miniterm -install: all - cp -a miniterm $(prefix)/usr/bin/ +all: $(TARGET) -dist: all - cp -a miniterm ../../../../install/bin/ +install: all + mkdir -p $(prefix)/usr/bin + install -m0755 $(TARGET) $(prefix)/usr/bin clean: - rm -f *.o miniterm *~ + $(RM) *.o $(TARGET) *~ diff --git a/tools/nsplitd/Makefile b/tools/nsplitd/Makefile index 661f750ce0..c5c4c9ed40 100644 --- a/tools/nsplitd/Makefile +++ b/tools/nsplitd/Makefile @@ -1,25 +1,22 @@ -CC = gcc -CFLAGS = -Wall -g -O3 -CFILES = $(wildcard *.c) +CC = gcc +CFLAGS = -Wall -O3 +CFILES = $(wildcard *.c) HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) -INSTALL_BINS := nsplitd +TARGET = nsplitd -all: nsplitd - -nsplitd: $(OBJS) - $(CC) $(CFLAGS) -o nsplitd $(OBJS) +all: $(TARGET) install: all -dist: all - clean: - $(RM) *.o $(INSTALL_BINS) + $(RM) *.o $(TARGET) *~ +$(TARGET): $(OBJS) + $(CC) $(CFLAGS) -o $@ $^ %.o: %.c $(HDRS) Makefile $(CC) $(CFLAGS) -c -o $@ $< diff --git a/tools/xc/Makefile b/tools/xc/Makefile index 0855485fd3..04b0e35fe1 100644 --- a/tools/xc/Makefile +++ b/tools/xc/Makefile @@ -7,10 +7,6 @@ install: all $(MAKE) -C lib install $(MAKE) -C py install -dist: all - $(MAKE) -C lib dist - $(MAKE) -C py dist - clean: $(MAKE) -C lib clean $(MAKE) -C py clean diff --git a/tools/xc/lib/Makefile b/tools/xc/lib/Makefile index 389c0958bc..544dcb6a66 100644 --- a/tools/xc/lib/Makefile +++ b/tools/xc/lib/Makefile @@ -26,18 +26,8 @@ check-for-zlib: install: all mkdir -p $(prefix)/usr/lib mkdir -p $(prefix)/usr/include - cp -a $(LIB) $(prefix)/usr/lib - chmod 755 $(prefix)/usr/lib/$(LIB) - cp xc.h $(prefix)/usr/include - chmod 644 $(prefix)/usr/include/xc.h - -dist: all - mkdir -p ../../../../install/lib - mkdir -p ../../../../install/include - cp -a $(LIB) ../../../../install/lib - chmod 755 ../../../../install/lib/$(LIB) - cp xc.h ../../../../install/include - chmod 644 ../../../../install/include/xc.h + install -m0755 $(LIB) $(prefix)/usr/lib + install -m0644 xc.h $(prefix)/usr/include clean: $(RM) *.a *.so *.o *.rpm $(LIB) diff --git a/tools/xc/py/Makefile b/tools/xc/py/Makefile index 9f66e3c05e..e3583f5dd8 100644 --- a/tools/xc/py/Makefile +++ b/tools/xc/py/Makefile @@ -4,15 +4,7 @@ all: install: all if [ "$(prefix)" = "" ]; then python setup.py install; \ - else python setup.py install --root "$(prefix)"; fi + else python setup.py install --home="$(prefix)"; fi -dist: all - mkdir -p ../../../../install/lib/python - for i in `find . -name 'Xc.so'` ; do \ - install --mode=755 $$i ../../../../install/lib/python/`basename $$i` ; \ - done - python -c 'import py_compile, sys; py_compile.compile("XenoUtil.py")' - install --mode=444 XenoUtil.py ../../../../install/lib/python - install --mode=644 XenoUtil.pyc ../../../../install/lib/python clean: rm -rf build *.pyc *.pyo *.o *.a *~ diff --git a/tools/xend/Makefile b/tools/xend/Makefile index 1ea271e80e..93c0cfe1f7 100644 --- a/tools/xend/Makefile +++ b/tools/xend/Makefile @@ -4,22 +4,9 @@ all: install: all if [ "$(prefix)" = "" ]; then python setup.py install; \ - else python setup.py install --root "$(prefix)"; fi - install --mode=755 xend $(prefix)/usr/sbin - -dist: all - mkdir -p ../../../../install/lib/python - for i in `find . -name 'xend_utils.so'` ; do \ - install --mode=755 $$i ../../../../install/lib/python/`basename $$i` ; \ - done - python -c 'import py_compile, sys; py_compile.compile("XenoUtil.py")' - install --mode=755 xend ../../../../install/sbin + else python setup.py install --home="$(prefix)"; fi + mkdir -p $(prefix)/usr/sbin + install -m0755 xend $(prefix)/usr/sbin clean: rm -rf build *.pyc *.pyo *.a *.so *.o *~ *.rpm - -$(BIN): $(OBJS) - $(CC) -o $@ $^ -L../xc/lib -lxc - -%.o: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) -c -o $@ $< diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 11beb34cd6..e19757e2fa 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -17,19 +17,9 @@ install: all mkdir -p $(prefix)/usr/bin mkdir -p $(prefix)/usr/man/man1 mkdir -p $(prefix)/usr/man/man8 - cp $(BIN) $(prefix)/usr/bin - for i in $(BIN); do chmod 755 $(prefix)/usr/bin/$$i; done - for i in $(MAN1); do cp $$i $(prefix)/usr/man/man1/$$i; done - for i in $(MAN8); do cp $$i $(prefix)/usr/man/man8/$$i; done - -dist: all - mkdir -p ../../../install/bin - mkdir -p ../../../install/man/man1 - mkdir -p ../../../install/man/man8 - cp $(BIN) ../../../install/bin - for i in $(BIN); do chmod 755 ../../../install/bin/$$i; done - for i in $(MAN1); do cp $$i ../../../install/man/man1/$$i; done - for i in $(MAN8); do cp $$i ../../../install/man/man8/$$i; done + install -m0755 $(BIN) $(prefix)/usr/bin + install -m0644 $(MAN1) $(prefix)/usr/man/man1 + install -m0644 $(MAN8) $(prefix)/usr/man/man8 clean: $(RM) *.a *.so *.o *.rpm $(BIN) diff --git a/xen/Makefile b/xen/Makefile index 7c19b75bb3..10c5562a2f 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -20,12 +20,7 @@ debug: install: $(TARGET) gzip -f -9 < $(TARGET) > $(TARGET).gz mkdir -p $(prefix)/boot - cp -a $(TARGET).gz $(prefix)/boot - -dist: $(TARGET) - gzip -f -9 < $(TARGET) > $(TARGET).gz - mkdir -p ../../install/boot - cp -a $(TARGET).gz ../../install/boot/ + install -m0644 $(TARGET).gz $(prefix)/boot clean: delete-links $(MAKE) -C tools clean diff --git a/xenolinux-2.4.25-sparse/arch/xeno/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/Makefile index e9822809e7..c55b190b54 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/Makefile +++ b/xenolinux-2.4.25-sparse/arch/xeno/Makefile @@ -100,12 +100,12 @@ bzImage: vmlinux @$(MAKEBOOT) xenolinux.gz install: bzImage - mkdir -p /boot - cp -a arch/$(ARCH)/boot/xenolinux.gz /boot/xenolinux.gz + mkdir -p $(prefix)/boot + install -m0644 arch/$(ARCH)/boot/xenolinux.gz $(prefix)/boot/xenolinux.gz dist: bzImage mkdir -p ../install/boot - cp -a arch/$(ARCH)/boot/xenolinux.gz ../install/boot/xenolinux.gz + install -m0644 arch/$(ARCH)/boot/xenolinux.gz ../install/boot/xenolinux.gz archclean: @$(MAKEBOOT) clean -- 2.30.2